cssparser: Drop _gtk_css_parser_has_prefix()

Replace it with has_ident/has_function. The old function is a typical
string matching API, not a tokenizing one.

diff --git a/gtk/gtkcsscalcvalue.c b/gtk/gtkcsscalcvalue.c
index 3b3b13327312144c95cfa9b0f292c569f6cf9a7e..f9279e76498232e2260487bdd074b5bd22ec1d09 100644 (file)
--- a/gtk/gtkcsscalcvalue.c
+++ b/gtk/gtkcsscalcvalue.c
@@ -316,7 +316,7 @@ static GtkCssValue *
 gtk_css_calc_value_parse_value (GtkCssParser           *parser,
                                 GtkCssNumberParseFlags  flags)
 {
-  if (_gtk_css_parser_has_prefix (parser, "calc"))
+  if (gtk_css_parser_has_function (parser, "calc"))
     {
       _gtk_css_parser_error (parser, "Nested calc() expressions are not allowed.");
       return NULL;

diff --git a/gtk/gtkcsseasevalue.c b/gtk/gtkcsseasevalue.c
index 1a1e66c92aafd669c5a8554518d8f6db5392496d..7dc851cd5b97c38e4325b25f52e570595b5a17b0 100644 (file)
--- a/gtk/gtkcsseasevalue.c
+++ b/gtk/gtkcsseasevalue.c
@@ -209,8 +209,16 @@ _gtk_css_ease_value_can_parse (GtkCssParser *parser)
 
   for (i = 0; i < G_N_ELEMENTS (parser_values); i++)
     {
-      if (_gtk_css_parser_has_prefix (parser, parser_values[i].name))
-        return TRUE;
+      if (parser_values[i].is_function)
+        {
+          if (gtk_css_parser_has_function (parser, parser_values[i].name))
+            return TRUE;
+        }
+      else
+        {
+          if (gtk_css_parser_has_ident (parser, parser_values[i].name))
+            return TRUE;
+        }
     }
 
   return FALSE;

diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c
index dd7a949b9f30672c21173608ee9d0358be116ee8..ac0eab182aeebeceffa6d6c914c0eb47db24a125 100644 (file)
--- a/gtk/gtkcssimage.c
+++ b/gtk/gtkcssimage.c
@@ -509,7 +509,7 @@ gtk_css_image_get_parser_type (GtkCssParser *parser)
 
   for (i = 0; i < G_N_ELEMENTS (image_types); i++)
     {
-      if (_gtk_css_parser_has_prefix (parser, image_types[i].prefix))
+      if (gtk_css_parser_has_function (parser, image_types[i].prefix))
         return image_types[i].type_func ();
     }
 

diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c
index 24396fa29dd282ae3dcfc0282467a79f2f8917e7..6b742c42e10f587cf336013b1eac1d653e307026 100644 (file)
--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -130,14 +130,14 @@ gboolean
 gtk_css_number_value_can_parse (GtkCssParser *parser)
 {
   return _gtk_css_parser_has_number (parser)
-      || _gtk_css_parser_has_prefix (parser, "calc");
+      || gtk_css_parser_has_function (parser, "calc");
 }
 
 GtkCssValue *
 _gtk_css_number_value_parse (GtkCssParser           *parser,
                              GtkCssNumberParseFlags  flags)
 {
-  if (_gtk_css_parser_has_prefix (parser, "calc"))
+  if (gtk_css_parser_has_function (parser, "calc"))
     return gtk_css_calc_value_parse (parser, flags);
 
   return gtk_css_dimension_value_parse (parser, flags);

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 66f0ad8ef21b267836fee68d2df78d08da1d815a..c9412e26bfdcd15b7f8ff238dc83673e4bd010a7 100644 (file)
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -90,15 +90,6 @@ _gtk_css_parser_free (GtkCssParser *parser)
   g_slice_free (GtkCssParser, parser);
 }
 
-gboolean
-_gtk_css_parser_has_prefix (GtkCssParser *parser,
-                            const char   *prefix)
-{
-  g_return_val_if_fail (GTK_IS_CSS_PARSER (parser), FALSE);
-
-  return g_ascii_strncasecmp (parser->data, prefix, strlen (prefix)) == 0;
-}
-
 guint
 _gtk_css_parser_get_line (GtkCssParser *parser)
 {
@@ -634,6 +625,21 @@ gtk_css_parser_has_token (GtkCssParser    *parser,
     }
 }
 
+gboolean
+gtk_css_parser_has_ident (GtkCssParser *parser,
+                          const char   *ident)
+{
+  gsize len;
+
+  g_return_val_if_fail (GTK_IS_CSS_PARSER (parser), FALSE);
+  g_return_val_if_fail (ident != NULL, FALSE);
+
+  len = strlen (ident);
+
+  return g_ascii_strncasecmp (parser->data, ident, len) == 0 &&
+         parser->data[len] != '(';
+}
+
 gboolean
 gtk_css_parser_has_function (GtkCssParser    *parser,
                              const char      *name)

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 001d2060e50c3de52d2835a8d826e9efdc3d8d9c..1611dea07c93cd470fd4d1edde0681d3e4edb592 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -62,10 +62,10 @@ GFile *         _gtk_css_parser_get_file          (GtkCssParser          *parser
 GFile *         _gtk_css_parser_get_file_for_path (GtkCssParser          *parser,
                                                    const char            *path);
 
-gboolean        _gtk_css_parser_has_prefix        (GtkCssParser          *parser,
-                                                   const char            *prefix);
 gboolean        gtk_css_parser_has_token          (GtkCssParser          *parser,
                                                    GtkCssTokenType        token_type);
+gboolean        gtk_css_parser_has_ident          (GtkCssParser          *parser,
+                                                   const char            *name);
 gboolean        gtk_css_parser_has_function       (GtkCssParser          *parser,
                                                    const char            *name);
 

diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index e653e69b98be1f6e89b5a31c7ef366545645acc2..6658f5eb33fbd607d5932e650a7e521f1ba7f7ff 100644 (file)
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -1036,7 +1036,7 @@ parse_selector_pseudo_class_nth_child (GtkCssParser   *parser,
             }
           a *= multiplier;
         }
-      else if (_gtk_css_parser_has_prefix (parser, "n"))
+      else if (gtk_css_parser_has_ident (parser, "n"))
         {
           a = multiplier;
         }

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 3b32c7f282d860000de5733dbb1286ac40f0a196..0f14bf952472bd8c6e39ef0bf76cf25e89175d12 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -261,7 +261,7 @@ parse_border_image (GtkCssShorthandProperty  *shorthand,
   do
     {
       if (values[0] == NULL &&
-          (_gtk_css_parser_has_prefix (parser, "none") ||
+          (gtk_css_parser_has_ident (parser, "none") ||
            _gtk_css_image_can_parse (parser)))
         {
           GtkCssImage *image;
@@ -507,7 +507,7 @@ parse_one_background (GtkCssShorthandProperty  *shorthand,
     {
       /* the image part */
       if (values[0] == NULL &&
-          (_gtk_css_parser_has_prefix (parser, "none") ||
+          (gtk_css_parser_has_ident (parser, "none") ||
            _gtk_css_image_can_parse (parser)))
         {
           GtkCssImage *image;